Fields and calculations added