Revert back to more simple module (after this commit)
Revert back to more simple module