Test 7 fixed working version