adding some more marker logic