implemented entry proxy into ride
fixed merge conflict