trying to get rid of all this