TEMP FIX: Remove count