Added naomi features at the very beginning.