refactoring to be a bit more selective