still a mess, but less