Second commit of academic.