Added new and more accurate methods\!