Save/Substitute differentiation

Added some stuff to check the second letter in case 's'.