Added RM and NM checks