still cleaning up the views