Added 2nd solution and fixed first up abit.