reading data for entries
updating works now
Merge branch 'dev'