lotta work on Boston
more changes