update for calculator logic

update for calculator logic