Removed offset calculation