beefed things up a bit
version 1