Recommit as per comments