some more factoring