Added "object first" and "position first" conditions