changed to find or create by for accuracy