New modifed and test