added intelligent lists - still some bugs