2014-05-01 update - Gotham compatible