EX stage updated. Not yet tested