some awful changes that didn't seem to fix anything