moving towards more sensible structure
all collection mode added