Removed unnecessary test
Multiple entries should work again
Better functionality in BASH