Got rid of graveyard section