Commiting the changes

Something is still wrong, but is will be submitted to allow revert if
needed.