Changed fields order
Removed point demo