Few more functions added and improved accuracy