last update after fixing all mess