Added changes to Module at 11.34