Now saving only allowed data and adjusting nicely to system output ordering