Changed code generation; fixed evaluation list