CJDv2 added quotes