added -rm and -t