last second tweeks from device testing