updates to use my team service and setup following logic too