Removed gridly for testing