Amends as per reviews