update for gotham, prepare for unified rules