Updated to latest platform