QUICK FIX - Current Entries