some changes in Work Flow