more or less works now