changes didn't make it with last commit