Update

More functions done