organizing more thoroughly