much better! still need to figure out extra factor of 2