Implement Change 3 (GreenPoint)