updated - prepacked extended version