updated handling of this