final version before.40 maybe