attempting to make it work more better