Removed types and added RMS