team and buddy filter done + syntax corrected + waiting for cr