Made a module out of it