small adjustments for onAll