- update from reviewing by jerry