CoreData works better now