Grid is now back on
merge