Updated Reshaping.
Final.