Adding comments + new stuff