Fixing quote issue + reorg