Collection: FIXES & OPTIMIZATION