removed atomic and fixed evaluation bug