Modifications after final version