Final Comment changes