Add version with preserveAspectRatio