almost works now