remove button makes stuff happen
Fixed conflicts