sarah/vivian | change id fields to int