changes  also fixed settings