Added pedestrian functions. Polishing.