working on new dispatch code