fixin up some work