Still messy, better