started working on CoreData improvement