inserting actual modularization of Radar