Refactring/addition/deletion