Some changes. Need to merge.