Improved grid performance and added delegate methods,