Ok, the last change completely broke things... trying again.