Some precalc added
Merge origin/master