updated modules for final working version