adjustments so I can fall back to previous method, just in case