adding changes missed in prior commits