Master refactoring + Entree Init + Dest