Working on simplified code.