changed all builds/creates to find or create by, to avoid repetition