Update functions

Useless eval's

(Untested)