Updates per jhugg review