Added last modifications