Changes per Gotham requirements