some quick modifications man