remove std ns; add normal mapping