Added variable & adjusted conditional statement