Incorparated Vik's feedback