fixed final version