last preparation to final commit
final version