I also made with some changes...your 1 is also good.