Updated for new thread