LAST FRONT END FIX