make it cx and cy instead of x, y for nodes
use path instaed of rectangle for diamond node