rebuild, add ui updates.