implementing yong's recommended changes