refactoring further
fix jungle (post refactor)