Final Updates before adding RDIO