Update & tick methods

- not about the removal part where I commented
- Perhaps its better to remove them when we get a Notification of a user
leaving?