A few modifications with nothing tested on it