finally passed Ed's evil tests @_@