evaluation bug fixed and reformatting