refactoring
adding setting