extended the pre final version