variables moved back to extension.