merge staging
updated subs