added 2 and 1b. check this please, very unsure about it