Modified according to test-kitchen