moved some logic around view object