fixed guido's misguided design choices