Should work -- rewrote to fit test