Checking in changes from Dave.