Added the possibility to only choose entering variable.