Searching and some reorganization