Updated program to compile on school machines