Integrated comments JSI

This will be more than 100ms (probably a bit more than 200ms) but I guess it's Ok :)