Added eval states option