Updated shapes