Organised classes, increased grid dimension