Fixed reove and add