Update: Had removed gap filling, now back, even cleaner