added if during class
manually merged with develop
Identifier bug fixed by Daniel Herzog