added Jason's reverted changes back in