Re-worked for new view