Fixing up semester (for real this time)