Point support (9/26)

Point support