Implements 1.5 upgrade