Calculate action now reads from form