Much better code.