CoreData working a bit better