Added work from tech huddle