woo
better factoring of constants