Some improvments. Have to do a proper study of data.