reorginization for clarity