Fix collisions
Store calculations
Inline access to PI