reorganize push 2 code and logic to better handle device arrival after program startup