more moving stuff around