cleaned 1a, 2.