Updated code

This is the final commit