please review and adjusted