made it work on live system