Redone and reorganized