Removed line hack; consolidated input condition.