Checking in before 1.5 changes