Added last corrections