Refactored and pulled the latest platform