Working version with the latest platform