updated academic version so that it looks ship shape