Edited Platform class
Fixed conflicts