07/04 refactoring