pulled changes from balderdashy