Updating models Issues 2,4,5