calc is much better now