This is much more elegant. Nice work.