Final changes for delivery