added module functionality, removed old version