Develop

funtion #119 finished