register
removed bad comment
merge complete