Update staging

Cael's BEF stuff(yes, this was looked over)