More Fons changes