updated with new modules, removed unneeded modules