change to map-like signagures