REFACTOR
added circle and diamond to group for click handler