Tested new code: ok