More complicated and more reliable!