Update

- Some improvements