Adjusted to include --rfriendly