Gotham

merge kib's changes