Self eval added and completed