RCM still broken, replacing old code