Get rid of hardcoded changes