fixed the rule on how the dispatcher must work
and developed as needed

Change-Id: I949171909e4ad293519f08e055dba6efd9406da9