Point support (8/26)

Point support