Final changes that work on LIVE