Integrating playfile modes
Fixed merge conflict