A few changes 

Take a look