added better crs handling