Adds singhy's part and minor changes