added Zodiak, refactoring