changes to server side and views