Update to My solutions 1, 2 and 6