Moved new code to Dongliang's class