Added marker logic