Had to ifdef some things so that user prog changes would work for part 1