Update to New Modules on Hypnos
Incooperate Richards Feedback