Add state to tupple
memory read fix