Current setup here: (see previous diagram including upstairs below)


Original pre-move diagram: