Changed the way it shows and handels models