Improve  to be independent