fixing Tim's stuff again