FINALLY OVERLAP FIX