moving stuff around so it flows better