Updated for gotham