Redesigned the models