worked on 1 and 2