added david's changes to view