fetch updates from tisdall

updates from tisdall