More work on site transition