Minor changes as per request