basic calc added
fix merge issues