Changes made by John Smith (UNSWCSProject1@gmail.com).