change to memriver
ajust code