Even better. These changes make it work. ＼(＾O＾)／  Can't say as much for the tests though... (◞‸◟；)