update todo, implement device-border-crossing check