Added rug option; allow extrapolation