Improvements local gloabl changes