Updated with trails