majid has been change the code