MODIFY: {RMC} Now much cleaner!!!