Changed to use modifier.