made it into a wrapper
removed the commented code