some little changes after feedback amber