Updated to use new views