Even more comments added