Re-Added Sapphire Tools