Small fixes on variable names
Inserting dispacther block at the beginning of the function