Final changes to spec mode