updated shit and added remove by id