Test 3 - Reverting to best working code