performance improvements.. still have to figure out slow contact
retrieval...