some changes before default logic