updated
handle multiple entries