incorporating magmatt, tomprince and dreid's review comments