Eflist alone

Some changes are made based on the comments.