Added settings and those features under it