some changes in the thrid dev