Little adjustment on norem stuff