PLEASE FIX 3007 FIRST!!!