Alternative shape(s)

Merging with main as alternative shape works