Changes made by Matthew Zalewski (matthew@minion.co.nz).