added solve for waitview
added solve for waitview