circle and square added