before merge on eastside
lots of changes