First version of combined modules implementation (working)