Make new feature actually work