Updated Grid, Allowed Apple class to use the Grid