update as per comments