Expand if statement