MASTER: Custom comments are now working.