CFD:ws2:completed first two functions