AMENDED AND RESTATED WARRANT AGREEMENT1