review and update v1