changed some opt