Updated with platform settings