change grid core for better customization
merge