Do not depend too much

521