adding random patches I can't remember what were for