refactored explorer