Updated model and design