Fixed as per reviewer comments