Added more core, and clean up