Tweaked to allow spaces in entries