change Dictionary with List
Merge commit 'cd6781838eaade5f2944bae49aab4dc969bf2554'
Arrow system working