These new changes are annoying as f**!