got rid of all the view functions