SOME CODE MODIFY