#time 3h some major refactoring of RA & RMT