Also a lil upgrade for amber:3