Final Version !!!!!!!!

Refactoring