All comments addressed