some NOT elegante modification