Fixed & more accurate version

Comments