reorganize some more