merge prep
merge prep
camera less wonky