Modifs after comments from public