Changed if/else blocks