Updated for submission to Squiz