Finished modeling changes