New version and remove warning