Added basic form calculations