I left some patch out