Added handle_calc