fixed cs, added hasOne back link