merged some update from live