Other shapes for lab 1 added