Update

Finalizing the code