Added a few changes to EX3