Commiting update to setup/play