Pool party

changes from today, innit