added squares and circles