Updated to module based feedback from wchen-r7