Added field calculations