Moved to new xtream and improved features