add stuff from Jess McJunkin