Marker implementation improved