misc
Redo core