Model and Code Update