tweaked core code.
tweaked core code.