...
make this work a little better