Much better code