changed code for the better
Merge.