update 2 with Amble's advices