Updated with zee changes