changes in  structure, add preg_replace..