Update

Trying to simplify the code but no luck.