incomplete offset calculation added