- incorporated Ken's latest changes