- update with reviewing code from jerry