Change from litter_id to just id