Rank and Shape updated