change to collections, provide better messages