Changes in final funtion..