Works! Plus a little polish