new entries are added in the end
refactored to use a couple resource