Merged circle & marker code