A simpler way to stay consistent...