returned to modularized core