This is the final version.  Can still work on display.