added support for to set mark on fly