fixing up calc