Trying to be less specific and hopefully transition will still work