update to more 'elegant' call.
add changes to future-use dispatcher also.