More changes from Matts comments