added variables, textfields and calculations