FINALLY finished FFixer