Fixed add but there are more bugzzzzz