Next attempt to introduce indicator functions.