merge in my changes from soc-krdc branch