cleaned up 1, 1.1, 1.2