refactoring and lobby