Update some functions with eval