Fixed final version