changing the way I do check, might do TeamPlay first