make it working on live mode too