Eric's scene (4) fix, hub edits