final fix up