Added minification/survival for  and