updated due to remarks by semaphor: better data source, more entries!