some patch work