Updated for the new semester