Point support (7/26)

Point support