extra credit now works as well, no problems