Some chamges/ But dont working now