Modified modules so they actually work correctly