added and modified some stuff from the beach