updated code

made package less specific and allows to be molded to any need