Added all new collection layout
Added named functions for clarity