Modifications for Tripstr