Update

All done except function