Code somewhat less not-working.