Cleaned up a bit to put on production server.
This one too.