Added view logic