added more calc fields