Test 3 - some improvents as suggested by user made, needs more work
next week