Changes to make lecturer happy (ish)