Cosmin2.2

with router