Much better, just use a closure... DUH