implemented new Dragon handler
implemented new Dragon handler
implemented better navigation