Changed a few things to remove holes