corrections per Amit