add more stuff into eval
Merge branch 'master' of github.com:Imbalism/588repo