Changes for use in WWU-CS lab