This seems to be working.