Minor comments. Need to finish