Updated standalone