updated changes
fixed partial routing
clean code
updated version