General commit

Router issue fix