added nonproper and sam options