Continuation of enhancement relating to #6