Work on Gotham compatibility