True, I will improve this. 

@jeremyquinton you had some ideas on this?