Point support (24/26)

Point support