THINGS THAT NEED TO BE CHANGED