Added command-t and options