Horrible last minute code changes