fix with tony's feedback