added remove and router functionality