add properties
fix signatures