Update

Finallizing the code