applied the changed with the local_settings

Signed-off-by: guymoller <guy.moller@gmail.com>