some changes needed