Simplified to a single point type