Temp tricks remove and Fok FIX