more separation and moving stuff around