modification for the new --without-decoration option