potentially messy changes