add stuff from jeff stultz