made workable for live version