More logic in place