updated more in favor of new Marquee API