Update from Justin. (Sorry for the delay)