Port over changes from the UNSW site