updated for math safari