Comment things to add and suggestion how to make it better