changes to custom scheme following Matt review