These changes seem like they may be for the better, but it still doesn't work yet