Two more shapes added