added core data
minor improvement