made calc
made it finaly