reorganized a bit more