Grid managment updated