Apply changes as per comment