Add, Refactor Code