update amber and related changes