Working on live mode