Point support (10/26)

Point support