added classes part2