towards final version