small changes to 1 and 2