more messy updates