Return to original if/else logic