fixed changes, please review