Final touchup changes'