Updated model and fix