reformat
change logic from false to true
override + refactoring