commiting the latest changes from the beach