probably fixed dependency-priority issues
closed #2 in previous commit and implemented changes in this one