Added a check, if the user has changed the needed variables