some changes ;)