moved function to parent class to avoid multidefintion
cleanups
Merge remote-tracking branch 'origin/dondavici' into andyblac