added ziggeo playback
resolved conflicts