Max's Calc Revision

Played with royces source code