Added 2a and finished 1