Two-file (module) version working