v1.1 - I made some minor changes