Changes made by Patrick Holmes (UNSWCSProject1@gmail.com).