McCain reveals new plan on immigration deal