Some reorginization