added some logic to calculator
Weekly update