some changes are beautifull