Last BETA version

Coding refactoring