Updated views to return differently;