Added Final Touches