CollectAndWraaper

code and improve