added point-state etc