more models added
unused code commented out