Change to SIGGRAPH format and add Dan's work.