Changes regarding clipping, player changes, missing enable and disable functionality
resolved merge conflict