ok, updated and ameded commit