Work branch feature f

update complete.
plz review.