This should be outside the if-else?