Grid Final Commit