Added temp removal of comments for testing...