Combined Script 1 and 2 into solution