Ok this is changed, exactly as you suggested @Ocramius !
@Majkl578 Can you please review and let us know if this is what you meant?