Updating and small changes