Added else statements to activation calls