Hi Danny!

Based on your feedback, I have split the changes. Please find the 
attached patches.

Regards,
RG.