refactoring, removing deprecating functions, changing settings
fix conflict