[WIP] Updates from CV 103

``` Description
Extra new line?