Refactored to use MathIsland