Added in more views