commit before test version - still contains view bug