Still messy, but now with correct amount