Removed calculating distance