re aranged some stuff