Final Version V 3.1

Finally Done