Changed parent-child system. Added router