Trying to be more consistent again