updates for @stucox