just need to comment and small changes to allow for jar packaging