Improving settings again :+1: