Address Patrick's changes in a way that isn't stupid