add returns to all views