complete A-833 swap (All new with upgrades!)

Replied to both via pm