Changes to work on live