updated for viewapp