Changed search of format to match