got functions to work in calculate

update v037beta