pedestrian and others
signatures
merging changes
merging changes