Made some changes but do check it over for yourself.