Adding in Richard’s Maestro Style Fixes