Updated to new sapphire api