update calc method
calculations working!!!