add modules for 2 versions. need more testing