need some fixes for xpert contents and its 50% done