REFACTORING some subtle changes, bother to tell
REFACTORING some subtle changes, bother to tell