Started porting to new amber