Done all --> fix some issue remained