AMENDED AND RESTATED WARRANT AGREEMENT -----------------