Updated with Triptometer code on 9/8/13