move subs around; probably fix one problem