Included Leonard's part and mine; Updated Code