Included old if else blocks
Removed spaces