Change absorb handler to add "and" logic