Various Improvements AddBefore now working