moved soem stuff around