small logics improvement