Updated gems
Finalized models