should do this more often