Minor feature enhancement