Output method updated to deal with different options