Update Code and Presentation