Some changes so Patrick can pull