new structure in basic usage, refactoring this file