Updated code eval