Updating: minorly fixing
Updating: merging