some changes for my needs