Changed Code for Presentation, changed models slightly