Fixed grid error
Removing and rewriting core methods