Removed the commented-out old version of the if else area.