Added conditions to person and to calculation