Math Update and Fix - Canvas Community