Gregs changes finished