- refaktoring and add Manager