Add Remove method
Reorganize